Posted
by Sridhar Ratnakumar
on Super User
See other posts from Super User
or by Sridhar Ratnakumar
Published on 2010-04-12T23:15:22Z
Indexed on
2010/04/12
23:23 UTC
Read the original article
Hit count: 437
diff has an option --recursive (-r) to do a comparison between two directories (the files inside them). Is there a way to make diff ignore certain sub-directories (eg: .svn)?
$ diff -r src1/ src2/
© Super User or respective owner
as seen on Stack Overflow
- Search for 'Stack Overflow'
Does anybody know of a diff-like tool that can show me the changes between two text files, but ignore changes in whitespace including newlines?
Here's an example:
the quick brown fox jumped over the lazy bear. the quick brown fox
jumped over the lazy bear. the quick brown fox jumped over the…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I have these two files
File:11
11
12345
File:22
123
456
Output of
diff 11 22
2c2
< 456123
---
> 789
Output to be
< 456123
> 789
I want it to not print 2c2 and "--" line. I looked at the man page but could not locate any help. Any ideas? The file has more than 1K lines
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
We have some directories that are tracked in both CVS and SVN (loooong story). When I change a file in one of these and run meld it diffs it against the SVN version. However for some of the other developers it diffs against CVS. Is there a way to specify which one gets priority?
Everyone is using…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Currently I am using google-diff-match-patch to implement a real-time editing tool, which can synchronize texts between multiple users. Everything works great when operations are only plain texts, each user's operation(add/delete texts) could be diff-ed out by comparing to old text snapshot with the…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Does anyone know of a diff viewer or comparison program that can do paragraph-based differentials? My repos has a large number of LaTeX files that are formatted into 80-character wide paragraphs (for easy editing with vim). It's currently very difficult to interpret the diffs between various versions…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy:
server {
server_name svn.ourdomain.tld;
location / {
proxy_pass http://localhost:8080;
}
}
Apache is set-up as follows:
<Location />
DAV svn
SVNParentPath…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have a particular problem with subversion.
Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn.
I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository.
There are many references to "subversion PROPSET 403…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have a set up with apache and subversion
In the apache configuration i have
<Location /svn>
DAV svn
SVNParentPath c:/svn
</Location>
Now i have multiple repositories
a
a_b
a_c
a_b_c
a_b_d
b
and i want to map them as
a/svn
a/b/svn
a/c/svn
a/b/c/svn
a/b/d/svn
b/svn
to do…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet.
Apache's path for html files is /var/www
I…
>>> More
